Better structure for fix