Fixed #178