Ta feedback fix #101