Add note regarding #16