hopefully fixed calcWho