fixed bugf