bugs needs to be fixed