Fixed some faulty code before a commit