Mixed some errors
Merge fix