Same bug as before but in different places..