fixing daniel