fix after merging #74
merge #75