closed #857 closed #923