Implements #14
Fixes issue with proxy activation on runtime