Make module alpha-8 compatible