Issue history

0097 and 0098