Fix #58
Fix #58