bug-fix: possible copy-paste error, fix field order