fix from requirement and merge with Force branch