Implements #358