Resolved issue with proxy-less configurations failing - issue #84