Issue 295 and Issue 294, ADR was getting generated twice!