Source code / optimization rules hot fix