Those 3 lines should have been merged in #25