JBTIS-287 - correct for luna