Implements #473