fix to address stephen's concern