610 fix