Issue #297 - returning the original endpoint name