Same source fix for other main functions
Wow...