Added fix for pre-honeycomb devices