fork and fix - service should when deployed, sent upstream 2 months ago