Small change for standalone version