fix issues by @limu