Better solution for #56