Bug fix with descriptions