Bug fix and release