Should this be inlined at first? (This was added to master today :))