fix leading zeros and clearing of source store