Resolve #46