Implements #349