Fix #60
Fix #60