Fixed the problems from the clone :x