* Fixing a crash in some cases