Revision to current() behaviour