Fixed error with parsing or