Possible solution to #542