revert to previous approach - so test would pass