Fix #43 Fix #47