fix to fi#2