fix construction order