[BUGFIX] Merge the fal properties correctly #595