Maybe fixed #145
Fixed #144