fixes on OrderHandler