Fix for fragmentation