addressed in commcarehq pr