fixed ward's bug :-)