Bug fix and minor improvement