Achi bugfix
Crash fixer? Who knows?