Fast fix of using hydrator