Fixed up OOP macro, thanks filwit!