#2528 fixed dojo issues