Fixed issue #215
Fixed issue #214