#242 fix