Fix delivery handler bug