Well, hackish fix...