Fixed moving across blocks in C++ in 24.4