fix architecture problem