Better handling of semicolon