last fix, hopefully #4