Resolve #349
Resolve #343