fix: changes in ServiceActionHandler are reverted because of unintended result