Oops.

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #413 from norv/fixes

Oops.