fix as thomas comments