Fixing another crash scenario