added fixes for calculator