It should have been done a long time ago