Fixing Daniel's shit