Bug fix for New Program