better solution for #44