several fix for over