fixed two crashers