fix for 61602678