standalone build fixed