Last fix to make this part work