Bug fix for simple analysis