ticket:59 fix marge problem