fixed crazy bug