GitHub #89 - Fix conditional