Prevent infinity result
Fix minor typos
Merge pull request #596 from moradology/feature/fix-infinite-accessibility

Prevent infinity result