Fix per suggestion