Issue238 -- fix #238