Issues (1968)

Branch: fix_for_older_macos