On site fix.
Fix crashing bug.