Also here be more strict on checking to return proper result. (some missed from previous commit)