Fixed bug with proxy and annotatiosn