Correcting moving layer bugs