Fixed the same mistakes here too!