ADEN-1156 General cases fix