Fix for PUB-443.