Fixed another bug - removed some debugging