Issue #452 Fixed a bug