Fix issue #481