Possible fix #1189