Fix makeLenses function