I think the attached patch addresses http://chirp.danplanet.com/issues/543 

It may also fix bug 409, but I don't quite understand the wording in that bug.
--