Utils: Fixed bug in draft