Zero payload workaround