added break to fix calc bug