possible solution for #543