BUG: Updtated function object end() behaviour