Add workaround for Zephyr