Attempt at fixing bug in call-from-anywhere.