Bug #1095
Bug #1098