Fixing of 'here now' issue