closed #1307
closed #1363
#1188