Quick honeycomb fix. To revisit later.