bug fix from JQ