Bug fix and task