clean up fix for #606