First pass at fixing issue 359