*bug fixin