Fixed bugs with assembly.