rewrite with Sublime, fix #2