fix for issue #481