Issue #452 Fixed bugs