Quirk fix