Current timestamp fix. No need for date instance