Issue 422

This closes issue #422, obviously.

@SirCmpwn - clear to merge.