critical bugs fix
merge