Bug positions fixed