Fixes #7 "Sporadic GUI freeze"