Try to make wrapping blocks work properly