Fix logical issue

With this #151 is fixed.