Update after implementation of feature #944.