Band-aid for #21