fix stuff hackily