Should have change this a long time ago.