Fixing unset error @ issue #16