Former fix not perfect