Helper fix