Fix package references while dual targeting (#642)

Fix package references while dual targeting (#642) #1576