[BugFix] #137, #430