Fix for with and when blocks with params