improved luna compatibility