fixed touch issues 2