fix ACT-1749 and provide testcase