conflicting name workaround. logic typo.
conflicting name workaround. logic typo.

rnovacek/konkretcmpi,rnovacek/konkretcmpi,kkaempf/konkretcmpi,kkaempf/konkretcmpi,kkaempf/konkretcmpi,rnovacek/konkretcmpi