added blocker and fix for 1040119