Issue #29: renaming function to be more explicit