fix #11 & #16 issue for Unresponsive JS