fixed cal issue