Fix for Issue#550

FOUC problem has been fixed