Another bugs fixed