microptimization, update seems to work afterall
Merge branch 'master' into mac