Jh/fix leading bug