Fix #488, close #489 [deploy snapshot]