fixed crashes on firmware 2.1