Fixed range issue