Fix CreateHandler bug