Bug fixed in the last 9f5df915a2bab3db72a6c8e1e2157a7ffb659380 commit