Fixed regression; fixed package dependencies