Updated publish safeguard