Based on discussion for #1097
Based on discussion for #1097