Fixed #127 for lens branch