Fixed some bugs in the dummy code