Fix ByPorten

Current Location