PIM-3363: fix broken handler definitions