closed #523 #537