Fix assembly issue