This should be fixed with commit
5f63905096e456097fca206f56ce9257f72faf64