after client fixes