[Fixed] Environment Issue, fixes #36