Possible fix of #6