Fixed bug from conversion - Michael Zucchi <notzed@gmail.com>