had some handlers mapping to wrong places