I added another issues that the offset issue should be fixed :)