- Found initial solution for #111