Fixed module for older versions