Jofreund patch 1