closed #1169 closed #1182