Fixed NOW() issue