Add check after calc