Fix for david