Bugfix: handle remote_address properly