Pre handlers, fixed OnConnectHandler