last fix, everything works now