fix to jon's update