Bug fix for inspection