Fix #255