Fixed infinite loop due to quoted arithmetic operators