bug fix towards #151
fixed #151