bug fix found by solo999
rebuilt files
Merge branch 'master' into styles