several fix