Fixed #150

Fixed #150