Does it resolve #741 ?