Bug-fix:

 - Re-instate this check until issue is resolved