Assembly bug fixed