possible implementation to address  #13183

possible implementation to address #13183
yeah sorry, i was having trouble following