Fix #55