Note to self: also add tests for this