Bugs needs to be fixed