Included a little fix for the macro window