Potential issue fix reported by Unknown_Mage