Possible fix #71