Fixed for no sunrise
More precise positions