Fix for OOM-1538