#JC-2020:Fixed handler mapping bug