same as previous fix for macro 7, this time for macro 8