Better solution for #69