LUNA Bug fix