Investigate root cause of #31 .
Investigate root cause of #31 .