Issues/1978 block site

Closes #1978