Fixed changes arisen during PR