Fixing builder, no coverage solution at this point