Proper fixing :(