diff --git a/aprslib/__init__.py b/aprslib/__init__.py
index fb0491d..101812b 100644
--- a/aprslib/__init__.py
+++ b/aprslib/__init__.py
@@ -27,16 +27,21 @@ from datetime import date as _date
 __date__ = str(_date.today())
 del _date
 
-from . import version
-__version__ = version.__version__
-del version
+from .version import __version__ as ref_version
+__version__ = ref_version
+del ref_version
 
 __author__ = "Rossen Georgiev"
 __all__ = ['IS', 'parse']
 
-from .parse import parse
-from . import IS
+from .parse import parse as refparse
+parse = refparse
+del refparse
+
+from .IS import IS as refIS
 
 
-class IS(IS.IS):
+class IS(refIS):
     pass
+
+del refIS
diff --git a/aprslib/parse.py b/aprslib/parse.py
index 84581d7..20c0bae 100644
--- a/aprslib/parse.py
+++ b/aprslib/parse.py
@@ -118,29 +118,22 @@ def parse(raw_sentence):
 
             parsed.update({'raw_timestamp': rawts})
 
+            timestamp = 0
             try:
                 if form in "hz/":
-                    if form == 'h':  # zulu hhmmss format
-                        timestamp = utc.strptime(
-                            "%s %s %s %s" % (utc.year, utc.month, utc.day, ts),
-                            "%Y %m %d %H%M%S"
-                            )
-                    elif form == 'z':  # zulu ddhhss format
-                        timestamp = utc.strptime(
-                            "%s %s %s" % (utc.year, utc.month, ts),
-                            "%Y %m %d%M%S"
-                            )
-                    elif form == '/':  # '/' local ddhhss format
-                        timestamp = utc.strptime(
-                            "%s %s %s" % (utc.year, utc.month, ts),
-                            "%Y %m %d%M%S"
-                            )
+                    # zulu hhmmss format
+                    if form == 'h':
+                        timestamp = "%s%s%s%s" % (utc.year, utc.month, utc.day, ts)
+                    # zulu ddhhmm format
+                    # '/' local ddhhmm format
+                    elif form in 'z/':
+                        timestamp = "%s%s%s%s" % (utc.year, utc.month, ts, utc.second)
 
+                    timestamp = utc.strptime(timestamp, "%Y%m%d%H%M%S")
                     timestamp = time.mktime(timestamp.timetuple())
-                else:
-                    timestamp = 0
-            except:
-                timestamp = 0
+            except Exception as exp:
+                logger.debug(exp)
+                pass
 
             parsed.update({'timestamp': int(timestamp)})
 
diff --git a/aprslib/version.py b/aprslib/version.py
index 140112c..32d1c9e 100644
--- a/aprslib/version.py
+++ b/aprslib/version.py
@@ -1 +1 @@
-__version__ = '0.6.30'
+__version__ = '0.6.31'