Worked around (not fixed) unlink bug