Bug fix with manual search