fix changes for 27/11