Fighting with the  bugs yet again :(