fixed, I will commit it later with other fixes