fixes all the bugs :-)