fixed mouse coordinates
merge problems