one more fix for extend and refactor page company