Bug fix for fresh program