fixed restore, added option