Added code to check for ; and :