Fixes #80 (needs more L0 stability)