Fix #231