Fixed last minute crash issue