Fix for multiple OPTIONS types