First pass at fixing 2529