fix for issue #484