Temporary fix for one more problem related to async serialization