fixed bugws