is this final commit to fix #822 ?