This is a fix for bug rabbit-51

 #rabbit-51 Finished tag e-stage