Fixed #165