Fix assembly resolution issue