Issue #16: Changed order of vars to match ctor