Fix for gui