fix bug where enforce return value was not using keys as keywords