Further resolves issue #1509