Fixed #2392
Possible fix for #2394