#169 fixed