patch 3 to fix issues