diff --git a/pype/plugins/maya/publish/collect_instances.py b/pype/plugins/maya/publish/collect_instances.py
index 5af717ba4d..9ea3ebe7fa 100644
--- a/pype/plugins/maya/publish/collect_instances.py
+++ b/pype/plugins/maya/publish/collect_instances.py
@@ -1,6 +1,7 @@
 from maya import cmds
 
 import pyblish.api
+import json
 
 
 class CollectInstances(pyblish.api.ContextPlugin):
@@ -32,6 +33,13 @@ class CollectInstances(pyblish.api.ContextPlugin):
         objectset = cmds.ls("*.id", long=True, type="objectSet",
                             recursive=True, objectsOnly=True)
 
+        ctx_frame_start = context.data['frameStart']
+        ctx_frame_end = context.data['frameEnd']
+        ctx_handle_start = context.data['handleStart']
+        ctx_handle_end = context.data['handleEnd']
+        ctx_frame_start_handle = context.data['frameStartHandle']
+        ctx_frame_end_handle = context.data['frameEndHandle']
+
         context.data['objectsets'] = objectset
         for objset in objectset:
 
@@ -108,14 +116,36 @@ class CollectInstances(pyblish.api.ContextPlugin):
             label = "{0} ({1})".format(name,
                                        data["asset"])
 
-            if "handles" in data:
-                data["handleStart"] = data["handles"]
-                data["handleEnd"] = data["handles"]
-
             # Append start frame and end frame to label if present
             if "frameStart" and "frameEnd" in data:
-                data["frameStartHandle"] = data["frameStart"] - data["handleStart"]
-                data["frameEndHandle"] = data["frameEnd"] + data["handleEnd"]
+
+                # if frame range on maya set is the same as full shot range
+                # adjust the values to match the asset data
+                if (ctx_frame_start_handle == data["frameStart"]
+                        and ctx_frame_end_handle == data["frameEnd"]):
+                    data["frameStartHandle"] = ctx_frame_start_handle
+                    data["frameEndHandle"] = ctx_frame_end_handle
+                    data["frameStart"] = ctx_frame_start
+                    data["frameEnd"] = ctx_frame_end
+                    data["handleStart"] = ctx_handle_start
+                    data["handleEnd"] = ctx_handle_end
+
+                # if there are user values on start and end frame not matching
+                # the asset, use them
+
+                else:
+                    if "handles" in data:
+                        data["handleStart"] = data["handles"]
+                        data["handleEnd"] = data["handles"]
+                    else:
+                        data["handleStart"] = 0
+                        data["handleEnd"] = 0
+
+                    data["frameStartHandle"] = data["frameStart"] - data["handleStart"]
+                    data["frameEndHandle"] = data["frameEnd"] + data["handleEnd"]
+
+                if "handles" in data:
+                    data.pop('handles')
 
                 label += "  [{0}-{1}]".format(int(data["frameStartHandle"]),
                                               int(data["frameEndHandle"]))
@@ -127,7 +157,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
             # Produce diagnostic message for any graphical
             # user interface interested in visualising it.
             self.log.info("Found: \"%s\" " % instance.data["name"])
-            self.log.debug("DATA: \"%s\" " % instance.data)
+            self.log.debug("DATA: {} ".format(json.dumps(instance.data, indent=4)))
 
         def sort_by_family(instance):
             """Sort by family"""
diff --git a/pype/plugins/maya/publish/collect_render.py b/pype/plugins/maya/publish/collect_render.py
index be3878e6bd..88c1be477d 100644
--- a/pype/plugins/maya/publish/collect_render.py
+++ b/pype/plugins/maya/publish/collect_render.py
@@ -41,6 +41,7 @@ import re
 import os
 import types
 import six
+import json
 from abc import ABCMeta, abstractmethod
 
 from maya import cmds
@@ -202,6 +203,28 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                     full_paths.append(full_path)
                 aov_dict["beauty"] = full_paths
 
+            frame_start_render = int(self.get_render_attribute("startFrame",
+                                                        layer=layer_name))
+            frame_end_render = int(self.get_render_attribute("endFrame",
+                                                        layer=layer_name))
+
+            if (int(context.data['frameStartHandle']) == frame_start_render and
+                    int(context.data['frameEndHandle']) == frame_end_render):
+
+                handle_start = context.data['handleStart']
+                handle_end = context.data['handleEnd']
+                frame_start = context.data['frameStart']
+                frame_end = context.data['frameEnd']
+                frame_start_handle = context.data['frameStartHandle']
+                frame_end_handle = context.data['frameEndHandle']
+            else:
+                handle_start = 0
+                handle_end = 0
+                frame_start = frame_start_render
+                frame_end = frame_end_render
+                frame_start_handle = frame_start_render
+                frame_end_handle = frame_end_render
+
             full_exp_files.append(aov_dict)
             self.log.info(full_exp_files)
             self.log.info("collecting layer: {}".format(layer_name))
@@ -211,20 +234,18 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                 "attachTo": attachTo,
                 "setMembers": layer_name,
                 "publish": True,
-                "frameStart": int(context.data["assetEntity"]['data']['frameStart']),
-                "frameEnd": int(context.data["assetEntity"]['data']['frameEnd']),
-                "frameStartHandle": int(self.get_render_attribute("startFrame",
-                                                            layer=layer_name)),
-                "frameEndHandle": int(self.get_render_attribute("endFrame",
-                                                          layer=layer_name)),
+
+                "handleStart": handle_start,
+                "handleEnd": handle_end,
+                "frameStart": frame_start,
+                "frameEnd": frame_end,
+                "frameStartHandle": frame_start_handle,
+                "frameEndHandle": frame_end_handle,
                 "byFrameStep": int(
                     self.get_render_attribute("byFrameStep",
                                               layer=layer_name)),
                 "renderer": self.get_render_attribute("currentRenderer",
                                                       layer=layer_name),
-                "handleStart": int(context.data["assetEntity"]['data']['handleStart']),
-                "handleEnd": int(context.data["assetEntity"]['data']['handleEnd']),
-
                 # instance subset
                 "family": "renderlayer",
                 "families": ["renderlayer"],
@@ -267,7 +288,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
             instance = context.create_instance(expected_layer_name)
             instance.data["label"] = label
             instance.data.update(data)
-        pass
+            self.log.debug("data: {}".format(json.dumps(data, indent=4)))
 
     def parse_options(self, render_globals):
         """Get all overrides with a value, skip those without