Issue #450 Fixed bugs