fix crucial bug