Issue 21 with proxy