Add fix to 042c735c