It's stable, fixes #7