really really really fix lockview - maybe