Feeder: fix message handler