Fix compatibily with ApiMapper