Issue 1303 fix

See commit messages...