fixed linux-mac buggies