Bug fix in GUI