Good point, we should do something better here.