Might be worth linking this to the Github ticket