Add custom handle to fix bug in our server