Possible fix for 1396