made special case hack working again