More module fixing