Bug fix in main