Fixed isseu #1814428: Removed block dependency.