it would be great to have a cleaner solution though....