Possible solution for #281