Add a workaround for DRFs bug