Fixed error, more places than thought