Bug fixed
New Style....