Slightly better hack, need to get with Karl on long term solution.