Fix #61

Fix #61