Now handling shipping events correctly