fix bug on rebuilds
Merge branch 'master' into fork