Fixed bug with non-default server port