Bridge class refactoring bug fix