hopefully fixing subcarrier issues