platform non-specific fix