Removed optional flag meanwhile