Added special value check