One additional fix for getting shapes out of Service [#75388674]