This patch fixes the #1 issue