Fix: make displaying closing message target as macro