Better protection in macro