fix wrong jr calculation