Bug FIX GUI #2