Fixed Options bug