Small clean up. But this still does not seem to be a good solution.