Fix for David