issue/#61

fixes #61