Fixed issue #424