@ahgittin, as @demobox suggested I think it would be useful to change also the original (bugged?) code here.