Fix for Shared Maps