Fix for Dynamic labels/values