Fork of Me to fix issue #2076691