Same changes as vyrly made - merging problem cause