some attempts to fix
dont use six now