diff --git a/lib/synthesis/asset_package.rb b/lib/synthesis/asset_package.rb
index 99c9f7a..87540c0 100644
--- a/lib/synthesis/asset_package.rb
+++ b/lib/synthesis/asset_package.rb
@@ -96,7 +96,7 @@ def initialize(asset_type, package_hash)
       target_parts = self.class.parse_path(package_hash.keys.first)
       @target_dir = target_parts[1].to_s
       @target = target_parts[2].to_s
-      @sources = package_hash[package_hash.keys.first]
+      @sources = package_hash[package_hash.keys.first].flatten.uniq
       @asset_type = asset_type
       @asset_path = "#{self.class.asset_base_path}/#{@asset_type}#{@target_dir.gsub(/^(.+)$/, '/\1')}"
       @extension = get_extension
diff --git a/test/asset_packager_test.rb b/test/asset_packager_test.rb
index dbeb52b..64bcc59 100644
--- a/test/asset_packager_test.rb
+++ b/test/asset_packager_test.rb
@@ -19,9 +19,9 @@ def teardown
   
   def test_find_by_type
     js_asset_packages = Synthesis::AssetPackage.find_by_type("javascripts")
-    assert_equal 2, js_asset_packages.length
-    assert_equal "base", js_asset_packages[0].target
-    assert_equal ["prototype", "effects", "controls", "dragdrop"], js_asset_packages[0].sources
+    assert_equal 3, js_asset_packages.length
+    assert_equal "base", js_asset_packages[1].target
+    assert_equal ["prototype", "effects", "controls", "dragdrop"], js_asset_packages[1].sources
   end
   
   def test_find_by_target
@@ -50,12 +50,12 @@ def test_delete_and_build
     js_package_names = Dir.new("#{Synthesis::AssetPackage.asset_base_path}/javascripts").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.js/) }.sort
     css_package_names = Dir.new("#{Synthesis::AssetPackage.asset_base_path}/stylesheets").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.css/) }.sort
     css_subdir_package_names = Dir.new("#{Synthesis::AssetPackage.asset_base_path}/stylesheets/subdir").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.css/) }.sort
-    
-    assert_equal 2, js_package_names.length
+
+    assert_equal 3, js_package_names.length
     assert_equal 2, css_package_names.length
     assert_equal 1, css_subdir_package_names.length
     assert js_package_names[0].match(/\Abase_packaged.js\z/)
-    assert js_package_names[1].match(/\Asecondary_packaged.js\z/)
+    assert js_package_names[2].match(/\Asecondary_packaged.js\z/)
     assert css_package_names[0].match(/\Abase_packaged.css\z/)
     assert css_package_names[1].match(/\Asecondary_packaged.css\z/)
     assert css_subdir_package_names[0].match(/\Astyles_packaged.css\z/)
@@ -63,11 +63,11 @@ def test_delete_and_build
   
   def test_js_names_from_sources
     package_names = Synthesis::AssetPackage.targets_from_sources("javascripts", ["prototype", "effects", "noexist1", "controls", "foo", "noexist2"])
-    assert_equal 4, package_names.length
-    assert package_names[0].match(/\Abase_packaged\z/)
-    assert_equal package_names[1], "noexist1"
-    assert package_names[2].match(/\Asecondary_packaged\z/)
-    assert_equal package_names[3], "noexist2"
+    assert_equal 5, package_names.length
+    assert package_names[1].match(/\Abase_packaged\z/)
+    assert_equal package_names[2], "noexist1"
+    assert package_names[3].match(/\Asecondary_packaged\z/)
+    assert_equal package_names[4], "noexist2"
   end
   
   def test_css_names_from_sources
diff --git a/test/asset_packages.yml b/test/asset_packages.yml
index 37287bd..2299771 100644
--- a/test/asset_packages.yml
+++ b/test/asset_packages.yml
@@ -1,9 +1,6 @@
 javascripts:
-- base:
-  - prototype
-  - effects
-  - controls
-  - dragdrop
+- global: &global [prototype]
+- base: [*global, effects, controls, dragdrop]
 - secondary:
   - foo
   - bar