Implements #451