fix crash with fw 2.8.1