Fixed two crashers