Fixed #234 #231