DAR-2351 fixing wall fatals