Fixed bug with save mode hack and unlink