Fixed some "buggy" code