Fixed #683: We should now take finish time from the function input instead of time() Closes #683 See merge request !261