More experimenting. Fixed the behavior for serialized build.