Solution to #832