Implements #266