solution for #138