fix too many bugs