Math is checked properly now