Re-implement fix