Implements #27