[WIP] fix snapshot