fix to previous changes