fixed type assignment / routing issue