Issue3146rebase

http://code.google.com/p/otwarchive/issues/detail?id=3862