Real fix for the apos issue