Potentially add to #1081
Potentially add to #1081