Fix helpers