#161 fixed