Fix problem with unstable building blocks