todo to remove custom logic once it is supported