Attempt to prevent double cap bug