some fixes to support first scenario