Properly fix it