some shit bug fixed