Fix bad source file
Clone rule + message state