Michael Khavkin
Bug fix
2b18943