Fixed rangy compatibility