Fix #41