Majore logic flaw found and fix on both goal first and goal second save modules. Thanks SAMI