Update Module-8, attempt to fix #21