Fixed #201 Fixed #202