fixed undefined values and W numeric