fix suffix arg. add correct fields (wow!)