Added lockedApp check