Fixed definitions per Issue #1