Fix bug when  not set. See #13