Added the secondary patch mentioned by ajvondrak