That Should Do It (updated)

Samsung had already quietly and unofficially admitted that Pen-Gate was their fault.  Now they have fixed it.

According to Phandroid, new Galaxy Note 5s will only allow the user to insert the pen one way allow the pen to be ejected safely if inserted backward (updated 16:34 EST)

How simple this seems, but how long it took!