Fixed bug with now