I wasn't happy about this one either. I don't see how to (easily) do this differently though, suggestions are welcome.