This doens't work. Let's fix this and add tests to make sure that it doesn't break again.