Implements #392