9574066 Fixing issues