Don't work around it here, fix in service