final fixes for block.call approach