Fix for the issues #1301764 && #1319744