Added the ability to handle nested-calls to msg's buffering.