stab at fixing issue 2541