added JPaul fix