abbr. fixes #19