Guard against issue #387