r2: fixed sun/moon rendering