fix assembly management