Port fix of #894 to Jaybird 6 (and to master)
Port fix of #894 to Jaybird 6 (and to master)