Fix for STAR9000651758 and STAR9000653090