Pull fix #48 into main repo