Bugfix: Use field name from param, don't hard-code