Create fabiostawinski-FixUnlisting

Issue #1627