rethink second stage bracket.
Fixes #457