Fixed more of the same bug