Bug #263
Bug #261