Properly fixed this time