Implements #901