Fix #22
Fix #22