fix 893

this fixes #893. @timlinux Please Apply to Master also