Implements #477