Fix of issue 193 (cvvergara)