fixing the things thanx @ianbeckford