[FIX] GUI, Closes #936