Moonlight type fix