crash bug fix

Conflicts:
	__main__.py