QuickFix #31

Last commit for tonight. So eh.