#252 fix