resolved #349
resolved #349