Continue #634