Resolve #352