could be a fix to concur modification error

So far it looks like it is working but more research/testing needs to be
done.
Merge pull request #264 from DarkGuardsman/master

could be a fix to concur modification error