Fix conflict with other modules