Resolve #49