changed semicolon case to something more general