Fix logic on finished check

Change-Id: Ia99e717ff16b501127f454900367c790f508c46c
Bugfix: Wanted the @class deployment

Change-Id: I11fbbd180d7742767086160530263f8d2ca82306