Bug fix and update