I'll add this to the to-do list. Not breaking anything too horribly, but it could definitely use a fix.