Fix #37 Fix #44