Assembly bug fix