I don't know if this was the right design choice for the long-run, but it felt uglier the other way;