Probably fix for issues #1401 #1402