more error fixing