it is fixed on my branch, I will push all commits there once it is ready I will merge into master.