Resolve conflict with donatomato's version