Fixed to check for options first