Fixed issues with 0, null and undefined values