-last minutes bug fixed