Have you listened to "Deaths end" yet? They run into a similar issue and prepose a solution.