Fix for draft