#604 fix