Issue/164 caddisfly