Think I accidentally reverted an earlier fix for this bug. Re-fixed.
Think I accidentally reverted an earlier fix for this bug. Re-fixed.

foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm,foocorp/gnu-fm