Fix #254