bug fixin