Another hackish attempt to fix things