Adds @despinoUY's fixes