TODO: Fix for microbit master