This fixes #56 by adding in `isset()`