HHH-8106 Fixed bug with Enhancement Task