Implemented suggestion discussed in HHH-5684