fixed collision issues between simple and full model