Manually added the fix from pr #187