Tried to fix gui crash bug :-)