bugs correction, again