Fixes #8 issue with  not being available.