more error fixing :)