Merge "fix patch 3"