Fix to add schema when in-schema macro is used with a single command