Fixed swapped options issues.