Bugfix 1280 proxy