This should fix the error BrokenMind reported. Thanks to nelgin for more excellent bug reporting and debugging.