Temporary fix to GUI