proposed solution for #1114