Closure function removed fix #20