Fixed Issue 36#.