Fix #240

 Issue #240