Platform specific fix