Fix for issues #619 and #620