added deferral support, fixes #57