fixed issue 74 for trunk