Fixed detail handeling