BUg Fixing.
bug fixing.