New build -- bug fix for calculator