removed the ugly little hack in favor of setting good defaults