Found some bugs that needs to be fixed