Bugfix to ensure that current cell is maintained when executing formula calculations