Fix #44