another anchor fix
fix merge conflict #915
Merge pull request #925 from mollybostic/master_0127

Master 0127