Fixing the standalone generation