Small Crash fix