Adding Fix for Frozen Properties