addressing #1056 & #85