Fix for nightly, which brings better handling of item macros