Possible remedy for #1287