Fix first wall bug