Added breaks as temporary workaround