Dev fix - Counting from the right needed a fix