Fixed issue#117, probably