Fixed the bug from http://forums.informaction.com/viewtopic.php?f=25&t=16649