JAL-1641 fixed broken functionalities after refactor

No match.