fix a bug for non-dynamic properties. code cleanup.