Fixed #199 #203