merging ehuels's fix for the extra semicolon