Fix for "ambiguous redirect" error during deploy