Resolve #1195