Fixed || logic so that if the first command is true it won't perform the second