new mad that fix #17 again :-)