Math: fool-proof configuration

Change-Id: I4c2a3fcee9b43a922edf4ce8bbb2cffb938e8e6e