Implements #624