Fix #50