Attempt to fix problem reported by Arne in issue #28