Cleaned up fix for #208
Merge branch 'master' into 1.6.4