Prevent duplicate modules
Fix free_form appearance