comment out line 491 about Deferred