Fix for Issue#550

FOUC problem has been fixed
Merge pull request #573 from jama707/master

Fix for Issue#550