Fixes Issue37: session.auto_start breaks session handling