SALT workaround