Fixed potential logical issues