Fix #229