Copy fix by Stas to fit the block