issue #215
fix