don't use .defer when uneeded. fixes #37