Fixed issue #688 : This fixes the partial issue. @sergeyklay