refixed issue with jamie fix