so, my solution in your git hub issue works ?