Attempt to address #1767