diff --git a/src/lime/tools/ProjectXMLParser.hx b/src/lime/tools/ProjectXMLParser.hx
index 3ffeadf62..aa79825e6 100644
--- a/src/lime/tools/ProjectXMLParser.hx
+++ b/src/lime/tools/ProjectXMLParser.hx
@@ -1670,20 +1670,21 @@ class ProjectXMLParser extends HXProject
 						parseXML(element, "", extensionPath);
 
 					case "certificate":
-						var path = null;
-
-						if (element.has.path)
+						if (element.has.path || element.has.type)
 						{
-							path = element.att.path;
-						}
-						else if (element.has.keystore)
-						{
-							path = element.att.keystore;
+							keystore = new Keystore();
 						}
 
-						if (path != null)
+						if (keystore != null)
 						{
-							keystore = new Keystore(Path.combine(extensionPath, substitute(element.att.path)));
+							if (element.has.path)
+							{
+								keystore.path = Path.combine(extensionPath, substitute(element.att.path));
+							}
+							else if (element.has.keystore)
+							{
+								keystore.path = Path.combine(extensionPath, substitute(element.att.keystore));
+							}
 
 							if (element.has.type)
 							{