PR #6 | fix null instead false