This is a little inconvenient and could be improved.