value macros fix