Bug fix and optimization