Issue #796 must be delayed for bundler