Potential fix to issue #6, pending approval