Fix issue #166 - Fix building project in a backwards compatible way