fixes issue 2587
Merge pull request #2589 from Aranclanos/pleaseblock

fixes issue 2587