attemp fix bug