Different approach for #146