Remove hack an implement it properly.