[WIP] #1856 fix

Fix for #1856