Fixed #203 Fixed #204