Bug fix and better description