Fixed calculator crash