Fixes #733 - Be more considerate of others