Port microblock fix to new system