#608 fix