Re: #1311 - js error fix