agreed this needs to be changed, could we merge and i fix it as a bug, or do you want it correct before it goes in?