closed #863 closed #930