fixed unfolding macros