Fixed #187