Issue 3911 spinoff

https://code.google.com/p/otwarchive/issues/detail?id=3998