possible remedy for #14