More attempts to get #15 solid.