Possible solution for #39.