changes for fast-cast 2.1