Fix for broken block polling