Fixed  BPMS-1070