Bug fix.
More updates