Fix for STAR9000658910