Calculaton init bug fixing